Auto merge of #1183 - parkr:patch-1, r=wycats
authorbors <bors@rust-lang.org>
Sun, 18 Jan 2015 18:25:21 +0000 (18:25 +0000)
committerbors <bors@rust-lang.org>
Sun, 18 Jan 2015 18:25:21 +0000 (18:25 +0000)
This seemed a little crucial.


Trivial merge